*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 757e36e4b123802156f178ad9f435e1a76c3b059..dd3201f7ea45ead43b8e2097789c878949179dac 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2000-12-22  Gerd Moellmann  <gerd@gnu.org>
 
+       * simple.el (delete-key-deletes-forward-mode): Simplify.  Also
+       backspace key combinations, depending on
+       delete-key-deletes-forward.
+
+       * bindings.el ([C-backspace]): Bind C-backspace to kill-word.
+
        * simple.el (delete-key-deletes-forward): Doc fix.
 
 2000-08-22  Emmanuel Briot  <briot@gnat.com>

diff --git a/src/ChangeLog b/src/ChangeLog
index 1d076114f9bfb4670d0227bf9470107eca36af6e..149df461daa95c14d08cddb5e9fd68db5d421cfb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -7,6 +7,10 @@
 
 2000-12-22  Gerd Moellmann  <gerd@gnu.org>
 
+       * window.c (size_window): When setting the window's too_small_ok
+       flag, compare old size with minimum size depending on WIDTH_P,
+       don't compare with window_min_width.
+       
        * window.c (delete_window): Simplify somewhat.
        (Fset_window_configuration): Don't SET_FRAME_GARBAGED after
        freeing window matrices.  The flag windows_or_buffers_changed is